Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix make tinderbox #2288

Merged
merged 2 commits into from
Jan 11, 2025
Merged

Fix make tinderbox #2288

merged 2 commits into from
Jan 11, 2025

Conversation

bsdjhb
Copy link
Collaborator

@bsdjhb bsdjhb commented Jan 10, 2025

This fixes the build on 32-bit platforms.

Fixes: dc91e74 ("zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly (#16334)")

@markjdb @bsdjhb
zdb: Fix printf formatting of a uint64_t
0163e82 
This fixes the build on 32-bit platforms.

Fixes:	dc91e74 ("zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly (#16334)")
@bsdjhb
Copy link
Collaborator Author

bsdjhb commented Jan 10, 2025

This fixes buildworld for armv7 and 32-bit powerpc. i386 dies with an internal crash in LLVM trying to build CHERI libc++. Stock LLVM can't deal with riscv64's atomic.h using __ATOMIC_RELEASE as the "failure" memory order with atomic_compare_exchange_n()

@jrtc27
Copy link
Member

jrtc27 commented Jan 10, 2025

This was already fixed in 654e0c4 then lost in def1808. Can we please apply the commit to our zfs repo's branches so that doesn't happen again?

@jrtc27
Copy link
Member

jrtc27 commented Jan 10, 2025

I'm worried there are other commits that have gone missing too...

@bsdjhb
Copy link
Collaborator Author

bsdjhb commented Jan 10, 2025

I'm worried there are other commits that have gone missing too...

I have it applied in the freebsd branch locally. I thought I did not need it during the last merge for some reason. Each merge I compare the head of the freebsd branch to sys/contrib/openzfs. There are a few cosmetic diffs I haven't merged into our repo (and that I've finally removed upstream a few months ago), but this it not one of them.

@bsdjhb
Copy link
Collaborator Author

bsdjhb commented Jan 10, 2025

My i386 failure was a red herring btw.

@bsdjhb
riscv atomic.h: Use __ATOMIC_RELAXED for the cmpset_rel fail memory o…
95e3175 
…rder

__ATOMIC_RELEASE is not permitted as a fail memory order and LLVM 18
errors on this.
@bsdjhb bsdjhb changed the title zdb: Fix printf formatting of a uint64_t Fix make tinderbox Jan 10, 2025
@bsdjhb bsdjhb merged commit a1fcfdd into CTSRD-CHERI:dev Jan 11, 2025
30 checks passed
@bsdjhb bsdjhb deleted the tinderbox branch January 11, 2025 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brooksdavis brooksdavis brooksdavis approved these changes

@jrtc27 jrtc27 jrtc27 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bsdjhb @jrtc27 @brooksdavis @markjdb